From a2af13a9deccb831e7c4ecc9bfb606aed203da09 Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Thu, 1 Aug 2024 12:33:25 +0000 Subject: [PATCH] disable-java-in-odk-build-examples-on-zero-vm Gbp-Pq: Name disable-java-in-odk-build-examples-on-zero-vm.diff --- config_host.mk.in | 1 + configure.ac | Bin 533595 -> 533904 bytes odk/Module_odk.mk | 4 ++++ 3 files changed, 5 insertions(+) diff --git a/config_host.mk.in b/config_host.mk.in index 3e1ae9f47e5..1b3d50b1339 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -349,6 +349,7 @@ export JAVAIFLAGS=@JAVAIFLAGS@ export JAVAIFLAGS_FOR_BUILD=@JAVAIFLAGS_FOR_BUILD@ export JAVA_CLASSPATH_NOT_SET=@JAVA_CLASSPATH_NOT_SET@ export JAVAINTERPRETER=@JAVAINTERPRETER@ +export JAVA_HAS_ZERO_VM=@JAVA_HAS_ZERO_VM@ export JAVA_HOME=@JAVA_HOME@ export JAVA_HOME_FOR_BUILD=@JAVA_HOME_FOR_BUILD@ export JAVA_SOURCE_VER=@JAVA_SOURCE_VER@ diff --git a/configure.ac b/configure.ac index 8d634d0a3c05c57f4fb1749b9ee4eb547dcea333..6cb17d75ab44491416e31dfc927bfb5f8515e646 100644 GIT binary patch delta 204 zcmcb8LSe#bg@zW!7N!>FEi7MVOy8Kzt~OnvhebrWv^X;_U7;i+RUs<1C|@DWH&&BN z0SRQLDNKJmiA9koy(qOnLAMaBY`S6rv)J_bRV-}0j=}L!u0j6sVZOGNT+=@;VU?S1 zP{JxSJ>VIO$h4)b{L?=?X62mjkju_8z2+Q?*mQ#mR*~roHZihqmz&8F&Nz8a5vPEc lW0+&S2g0Q32bowyruWQa;cCA)iv@^TftYRk#aZlKod8g$MqvN| delta 61 zcmbPmTH*Eyg@zW!7N!>FEi7MVOn1yl_CK@Pr*r}U68{=$ diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk index 0d5fca58d2c..6bbe1e826e3 100644 --- a/odk/Module_odk.mk +++ b/odk/Module_odk.mk @@ -59,10 +59,14 @@ $(eval $(call gb_Module_add_check_targets,odk,\ ifneq ($(filter $(OS),LINUX MACOSX),) $(eval $(call gb_Module_add_subsequentcheck_targets,odk, \ CustomTarget_build-examples \ +)) +ifneq ($(JAVA_HAS_ZERO_VM),y) +$(eval $(call gb_Module_add_subsequentcheck_targets,odk, \ $(if $(ENABLE_JAVA),\ CustomTarget_build-examples_java \ ) \ )) endif +endif # vim: set noet sw=4 ts=4: -- 2.30.2